Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 20 Feb 2010 13:10:32 +0000 (13:10 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 20 Feb 2010 13:10:32 +0000 (13:10 +0000)

Trivial merge